From c6dd439ade5f9c2463fe0ff3adf291dec6fc2172 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Thu, 3 Dec 2015 11:21:59 +0000
Subject: [PATCH] mce-test: do not include libxenguest internal headers

As far as I can tell there is no requirement for these and it builds
fine without them.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---
 tools/tests/mce-test/tools/Makefile     | 2 --
 tools/tests/mce-test/tools/xen-mceinj.c | 2 --
 2 files changed, 4 deletions(-)

diff --git a/tools/tests/mce-test/tools/Makefile b/tools/tests/mce-test/tools/Makefile
index 924e4ddbdf..0e92ac2977 100644
--- a/tools/tests/mce-test/tools/Makefile
+++ b/tools/tests/mce-test/tools/Makefile
@@ -3,8 +3,6 @@ include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS += -Werror
 CFLAGS += $(CFLAGS_libxenctrl)
-# xen-mceinj.c incorrectly use libxc internals
-CFLAGS += -I$(XEN_ROOT)/tools/libxc
 CFLAGS += $(CFLAGS_libxenguest)
 CFLAGS += $(CFLAGS_libxenstore)
 CFLAGS += $(CFLAGS_xeninclude)
diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c
index 31cdb0409c..d22f0add7f 100644
--- a/tools/tests/mce-test/tools/xen-mceinj.c
+++ b/tools/tests/mce-test/tools/xen-mceinj.c
@@ -31,12 +31,10 @@
 #include <stdarg.h>
 
 #include <xenctrl.h>
-#include <xg_private.h>
 #include <xenguest.h>
 #include <inttypes.h>
 #include <sys/time.h>
 #include <xen/arch-x86/xen-mca.h>
-#include <xg_save_restore.h>
 #include <xenstore.h>
 
 #define MCi_type_CTL        0x0
-- 
2.30.2